gnomeos: Pull in libuuid and libblkid from util-linux

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 58366566f37c780131a97cf97ed80884e6aa8c5d..133a2c897cb9054ad143a452f378509eae547e67 100644 (file)
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -7,18 +7,23 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit rootfs_${IMAGE_PKGTYPE}
 
-PACKAGE_INSTALL = "task-core-boot \
+IMAGE_INSTALL = ""
+
+RECIPE_PACKAGES = "task-core-boot \
                   coreutils \
                   ostree ostree-init \
                   strace \
                   bash \
                   tar \
+                  grep \
                   gawk \
                   ncurses \
                   python-modules \
                   python-misc"
 
-RDEPENDS += "${PACKAGE_INSTALL}"
+PACKAGE_INSTALL = "${RECIPE_PACKAGES} ${IMAGE_INSTALL}"
+
+RDEPENDS += "${RECIPE_PACKAGES}"
 DEPENDS += "makedevs-native virtual/fakeroot-native"
 
 EXCLUDE_FROM_WORLD = "1"

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
index 7f815a9e1a3d1e4bb9355145c0196a8263568619..59a2990a2294188eaf46acd773054c9abe0f18c2 100644 (file)
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
@@ -7,9 +7,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit gnomeos-contents
 
-PACKAGE_INSTALL += "task-core-sdk \
+RECIPE_PACKAGES += "task-core-sdk \
                python-dev \
                bison flex \
                git \
                libxml-parser-perl \
                "
+
+IMAGE_INSTALL += "libuuid-dev \
+                 libblkid-dev \
+                 "